<html>
<head><meta charset="utf-8"><title>Cannot pull from master · t-compiler/help · Zulip Chat Archive</title></head>
<h2>Stream: <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/index.html">t-compiler/help</a></h2>
<h3>Topic: <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Cannot.20pull.20from.20master.html">Cannot pull from master</a></h3>

<hr>

<base href="https://rust-lang.zulipchat.com">

<head><link href="https://rust-lang.github.io/zulip_archive/style.css" rel="stylesheet"></head>

<a name="240481364"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Cannot%20pull%20from%20master/near/240481364" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> BN <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Cannot.20pull.20from.20master.html#240481364">(May 27 2021 at 15:02)</a>:</h4>
<p>I get the following error when trying to use <code>git pull upstream master</code>:</p>
<div class="codehilite"><pre><span></span><code>error: The following untracked working tree files would be overwritten by merge:
    src/tools/rustfmt/.editorconfig
    src/tools/rustfmt/.github/workflows/integration.yml
    src/tools/rustfmt/.github/workflows/linux.yml
    src/tools/rustfmt/.github/workflows/mac.yml
    src/tools/rustfmt/.github/workflows/upload-assets.yml
    src/tools/rustfmt/.github/workflows/windows.yml
    src/tools/rustfmt/.gitignore
    src/tools/rustfmt/.travis.yml
    src/tools/rustfmt/CHANGELOG.md
    src/tools/rustfmt/CODE_OF_CONDUCT.md
    src/tools/rustfmt/Cargo.lock
    src/tools/rustfmt/Cargo.toml
        ....
Aborting
</code></pre></div>
<p>Can anybody help me out here, please?</p>



<a name="240481505"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Cannot%20pull%20from%20master/near/240481505" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> Vadim Petrochenkov <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Cannot.20pull.20from.20master.html#240481505">(May 27 2021 at 15:03)</a>:</h4>
<p><code>git submodule deinit src/tools/rustfmt</code> then try pulling again?</p>



<a name="240481691"></a>
<h4><a href="https://rust-lang.zulipchat.com#narrow/stream/182449-t-compiler/help/topic/Cannot%20pull%20from%20master/near/240481691" class="zl"><img src="https://rust-lang.github.io/zulip_archive/assets/img/zulip.svg" alt="view this post on Zulip" style="width:20px;height:20px;"></a> BN <a href="https://rust-lang.github.io/zulip_archive/stream/182449-t-compiler/help/topic/Cannot.20pull.20from.20master.html#240481691">(May 27 2021 at 15:04)</a>:</h4>
<p>Thank you.</p>



<hr><p>Last updated: Aug 07 2021 at 22:04 UTC</p>
</html>